From: Ray Strode <rstrode@redhat.com>
Date: Mon, 4 Mar 2013 13:07:14 +0000 (-0500)
Subject: main: don't hook up overview keybinding until after startup
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~4566
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=cd37e2908faede6747d69e04b25035076541e672;p=gnome-shell.git

main: don't hook up overview keybinding until after startup

Toggling the overview during the startup animation reportedly
causes stuck grab and other odd behavior.

There's no reason to handle toggling the overview during this
time anyway.

This commit defers that handling until after startup.

https://bugzilla.gnome.org/show_bug.cgi?id=694837
---

diff --git a/js/ui/layout.js b/js/ui/layout.js
index 61e225066..b178b53c8 100644
--- a/js/ui/layout.js
+++ b/js/ui/layout.js
@@ -639,6 +639,8 @@ const LayoutManager = new Lang.Class({
         this.emit('panel-box-changed');
 
         this._queueUpdateRegions();
+
+        this.emit('startup-complete');
     },
 
     showKeyboard: function () {
diff --git a/js/ui/main.js b/js/ui/main.js
index d3ce7df76..4025bd787 100644
--- a/js/ui/main.js
+++ b/js/ui/main.js
@@ -58,7 +58,7 @@ let shellDBusService = null;
 let shellMountOpDBusService = null;
 let screenSaverDBus = null;
 let modalCount = 0;
-let keybindingMode = Shell.KeyBindingMode.NORMAL;
+let keybindingMode = Shell.KeyBindingMode.NONE;
 let modalActorFocusStack = [];
 let uiGroup = null;
 let magnifier = null;
@@ -202,6 +202,11 @@ function startSession() {
     layoutManager.connect('startup-prepared', function() {
                               layoutManager.startupAnimation();
                           });
+    layoutManager.connect('startup-complete', function() {
+                              if (keybindingMode == Shell.KeyBindingMode.NONE) {
+                                  keybindingMode = Shell.KeyBindingMode.NORMAL;
+                              }
+                          });
 }
 
 let _workspaces = [];